From c955072b67722cdeee7a7833c670f1e2e513c7ba Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 28 Feb 2007 19:37:08 +0000 Subject: [PATCH] Make color scheme update properly when changing themes. (#402131, Benjamin 2007-02-28 Matthias Clasen * gtk/gtksettings.c: Make color scheme update properly when changing themes. (#402131, Benjamin Berg) svn path=/trunk/; revision=17366 --- ChangeLog | 5 +++++ gtk/gtksettings.c | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2d9469258..b8d870d888 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-02-28 Matthias Clasen + + * gtk/gtksettings.c: Make color scheme update properly + when changing themes. (#402131, Benjamin Berg) + 2007-02-28 Matthias Clasen * gtk/gtkrc.c: Don't leak references to the color-hash diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 8fdb459861..c5eaadd19a 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -1926,13 +1926,12 @@ add_color_to_hash (gchar *name, GdkColor *color, GHashTable *target) { - GdkColor *old, *new; + GdkColor *old; old = g_hash_table_lookup (target, name); if (!old || !gdk_color_equal (old, color)) { - new = gdk_color_copy (color); - g_hash_table_insert (target, g_strdup (name), new); + g_hash_table_insert (target, g_strdup (name), gdk_color_copy (color)); return TRUE; } @@ -1979,7 +1978,7 @@ add_colors_to_hash_from_string (GHashTable *hash, } if (gdk_color_parse (p, &color)) - changed = add_color_to_hash (name, &color, hash); + changed |= add_color_to_hash (name, &color, hash); } g_free (copy); -- 2.30.2